From 50d4028f8406aee74fa534f29d1fb226f9ea64f1 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 3 Jul 2006 08:29:57 -0600 Subject: [PATCH] [IA64] Clean up unused functions Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Xu --- xen/arch/ia64/vmx/vmx_phy_mode.c | 16 ---------------- xen/arch/ia64/xen/regionreg.c | 19 ------------------- xen/include/asm-ia64/regionreg.h | 1 - xen/include/asm-ia64/vmx_phy_mode.h | 1 - 4 files changed, 37 deletions(-) diff --git a/xen/arch/ia64/vmx/vmx_phy_mode.c b/xen/arch/ia64/vmx/vmx_phy_mode.c index 52825720e0..372619dd50 100644 --- a/xen/arch/ia64/vmx/vmx_phy_mode.c +++ b/xen/arch/ia64/vmx/vmx_phy_mode.c @@ -204,23 +204,7 @@ vmx_load_all_rr(VCPU *vcpu) ia64_srlz_i(); } -void -vmx_load_rr7_and_pta(VCPU *vcpu) -{ - unsigned long psr; - - local_irq_save(psr); - - vmx_switch_rr7(vrrtomrr(vcpu,VMX(vcpu, vrr[VRN7])), - (void *)vcpu->domain->shared_info, - (void *)vcpu->arch.privregs, - (void *)vcpu->arch.vhpt.hash, pal_vaddr ); - ia64_set_pta(vcpu->arch.arch_vmx.mpta); - ia64_srlz_d(); - local_irq_restore(psr); - ia64_srlz_i(); -} void switch_to_physical_rid(VCPU *vcpu) diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c index cebed96efc..58c89201fb 100644 --- a/xen/arch/ia64/xen/regionreg.c +++ b/xen/arch/ia64/xen/regionreg.c @@ -342,22 +342,3 @@ void load_region_regs(struct vcpu *v) panic_domain(0,"load_region_regs: can't set! bad=%lx\n",bad); } } - -void load_region_reg7_and_pta(struct vcpu *v) -{ - unsigned long rr7, pta; - - if (!is_idle_domain(v->domain)) { - ia64_set_pta(VHPT_ADDR | (1 << 8) | (VHPT_SIZE_LOG2 << 2) | - VHPT_ENABLED); - - // TODO: These probably should be validated - rr7 = VCPU(v,rrs[7]); - if (!set_one_rr(0xe000000000000000L, rr7)) - panic_domain(0, "%s: can't set!\n", __func__); - } - else { - pta = ia64_get_pta(); - ia64_set_pta(pta & ~VHPT_ENABLED); - } -} diff --git a/xen/include/asm-ia64/regionreg.h b/xen/include/asm-ia64/regionreg.h index 7b9baecd9e..c2e9ecc682 100644 --- a/xen/include/asm-ia64/regionreg.h +++ b/xen/include/asm-ia64/regionreg.h @@ -79,6 +79,5 @@ extern void init_all_rr(struct vcpu *v); extern int set_metaphysical_rr0(void); extern void load_region_regs(struct vcpu *v); -extern void load_region_reg7_and_pta(struct vcpu *v); #endif /* !_REGIONREG_H_ */ diff --git a/xen/include/asm-ia64/vmx_phy_mode.h b/xen/include/asm-ia64/vmx_phy_mode.h index c480d11dfc..02f8cc643f 100644 --- a/xen/include/asm-ia64/vmx_phy_mode.h +++ b/xen/include/asm-ia64/vmx_phy_mode.h @@ -96,7 +96,6 @@ extern void prepare_if_physical_mode(VCPU *vcpu); extern void recover_if_physical_mode(VCPU *vcpu); extern void vmx_init_all_rr(VCPU *vcpu); extern void vmx_load_all_rr(VCPU *vcpu); -extern void vmx_load_rr7_and_pta(VCPU *vcpu); extern void physical_tlb_miss(VCPU *vcpu, u64 vadr); /* * No sanity check here, since all psr changes have been -- 2.30.2